From 0c1cbcfe6012a19b5b830871d267502f5d001e38 Mon Sep 17 00:00:00 2001 From: William Hua Date: Fri, 10 Mar 2017 10:50:23 -0500 Subject: [PATCH] mir: try mir before x11 --- gdk/gdkdisplaymanager.c | 6 +++--- gdk/mir/gdkmirdisplay.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 2950d80520..2bd670f399 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -272,12 +272,12 @@ static GdkBackend gdk_backends[] = { #ifdef GDK_WINDOWING_WAYLAND { "wayland", _gdk_wayland_display_open }, #endif +#ifdef GDK_WINDOWING_MIR + { "mir", _gdk_mir_display_open }, +#endif #ifdef GDK_WINDOWING_X11 { "x11", _gdk_x11_display_open }, #endif -#ifdef GDK_WINDOWING_MIR - { "mir", _gdk_mir_display_open }, -#endif #ifdef GDK_WINDOWING_BROADWAY { "broadway", _gdk_broadway_display_open }, #endif diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c index 9dccb32bd6..25a3a03e67 100644 --- a/gdk/mir/gdkmirdisplay.c +++ b/gdk/mir/gdkmirdisplay.c @@ -183,7 +183,6 @@ _gdk_mir_display_open (const gchar *display_name) if (!mir_connection_is_valid (connection)) { - g_printerr ("Failed to connect to Mir: %s\n", mir_connection_get_error_message (connection)); mir_connection_release (connection); return NULL; } -- 2.30.2